[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <2537C4E1-5434-4C6B-95A1-2360BA0803FB@intel.com>
Date: Thu, 9 Jan 2014 17:27:44 +0000
From: "Rustad, Mark D" <mark.d.rustad@...el.com>
To: Scott Feldman <sfeldma@...il.com>
CC: "Brown, Aaron F" <aaron.f.brown@...el.com>,
David Miller <davem@...emloft.net>,
Netdev <netdev@...r.kernel.org>,
"gospo@...hat.com" <gospo@...hat.com>,
"sassmann@...hat.com" <sassmann@...hat.com>
Subject: Re: [net-next 2/7] ixgbe: Indicate removal state explicitly
On Jan 8, 2014, at 12:35 AM, Scott Feldman <sfeldma@...il.com> wrote:
> On Jan 7, 2014, at 11:40 PM, Aaron Brown <aaron.f.brown@...el.com> wrote:
>
>> From: Mark Rustad <mark.d.rustad@...el.com>
>>
>> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
>> index 5e157ac..480c5c1 100644
>> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
>> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.h
>> @@ -124,6 +124,11 @@ s32 ixgbe_reset_pipeline_82599(struct ixgbe_hw *hw);
>> s32 ixgbe_get_thermal_sensor_data_generic(struct ixgbe_hw *hw);
>> s32 ixgbe_init_thermal_sensor_thresh_generic(struct ixgbe_hw *hw);
>>
>> +#define IXGBE_FAILED_READ_REG 0xffffffffU
>> +
>> +void ixgbe_check_remove(struct ixgbe_hw *hw, u32 reg);
>> +#define IXGBE_REMOVED(a) unlikely(!(a))
>
> IXGBE_REMOVED seems pretty closely tied to hw->hw_addr, but the macro turns any input into !input. Maybe an inline that takes a *hw?
An earlier version had two different inputs, but not any more. I will change it to take a hw parameter. Good suggestion.
<snip>
>> @@ -2970,7 +2999,7 @@ void ixgbe_configure_tx_ring(struct ixgbe_adapter *adapter,
>> ring->count * sizeof(union ixgbe_adv_tx_desc));
>> IXGBE_WRITE_REG(hw, IXGBE_TDH(reg_idx), 0);
>> IXGBE_WRITE_REG(hw, IXGBE_TDT(reg_idx), 0);
>> - ring->tail = hw->hw_addr + IXGBE_TDT(reg_idx);
>> + ring->tail = adapter->io_addr + IXGBE_TDT(reg_idx);
>
> How is this related to the commit msg about register reads? Seems like two patches.
No, it is theoretically possible for hw_addr to be NULL now if a removal was somehow detected, so using the new io_addr that will never be NULL is safer. The possibility of hw_addr being NULL is introduced by these patches, so this change should be a part of these patches.
<snip>
Sorry for the duplicate Scott. You may have noticed that I failed to copy everyone else as I should have.
--
Mark Rustad, Networking Division, Intel Corporation
Download attachment "signature.asc" of type "application/pgp-signature" (842 bytes)
Powered by blists - more mailing lists